Skip to content

[202411][sonic-mgmt]Fix decap/test_subnet_decap.py::test_vlan_subnet_…#18778

Merged
StormLiangMS merged 1 commit intosonic-net:202411from
pragnya-arista:202411-Fix-Decap-test_subnet_decap
Jun 9, 2025
Merged

[202411][sonic-mgmt]Fix decap/test_subnet_decap.py::test_vlan_subnet_…#18778
StormLiangMS merged 1 commit intosonic-net:202411from
pragnya-arista:202411-Fix-Decap-test_subnet_decap

Conversation

@pragnya-arista
Copy link
Contributor

…decap

Description of PR

Summary:
Fixes # (591)

Type of change

  • Bug fix
  • Testbed and Framework(new/improvement)
  • New Test case
    • Skipped for non-supported platforms
  • Test case improvement

Back port request

  • 202205
  • 202305
  • 202311
  • 202405
  • 202411
  • 202505

Approach

What is the motivation for this PR?

  • Fixes failures for decap/test_subnet_decap::test_vlan_subnet_decap[negative-IPv4/6] for active-standby dualtor topos
  • The test selects the DUT randomly, irrespective of it being the standby ToR
  • In the positive case, this will not be a problem - the encapsulated packet is sent with an outer SIP that matches the
    config on the DUT, the packet gets decapped and gets routed towards the upstream T1s
  • In the negative case, the outer SIP does not match the config on the DUT and hence will not be decapsulated, but
    forwarded to the outer DIP, which is set to IP 192.168.0.200/fc02:1000::200
  • This will require forwarding over one of the downstream ports where the ARP responder is also set up - if the
    DUT is a standby; this forwarding will not happen

How did you do it?

  • This fix calls fixture to ensure the selected DUT will be the active ToR, and the non-decapsulated packet can be
    forwarded along the downstream port

How did you verify/test it?

Ran decap/test_subnet_decap.py on DCS-7050CX3

Any platform specific information?

Supported testbed topology if it's a new test case?

Documentation

@StormLiangMS
Copy link
Collaborator

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Collaborator

@StormLiangMS StormLiangMS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@StormLiangMS StormLiangMS merged commit 2e4247b into sonic-net:202411 Jun 9, 2025
14 checks passed
@StormLiangMS
Copy link
Collaborator

hi @pragnya-arista could you raise PR to master also? and then cherrypick from master to 202505 branch.

@yejianquan
Copy link
Collaborator

Hi @pragnya-arista removing request label for 202505, please request cherry-pick from master branch

@pragnya-arista
Copy link
Contributor Author

hi @pragnya-arista could you raise PR to master also? and then cherrypick from master to 202505 branch.

Thank you - will do

sdszhang pushed a commit to sdszhang/sonic-mgmt that referenced this pull request Jun 14, 2025
Code sync sonic-net/sonic-mgmt:202411 => 202412

```
*   1f86dab (HEAD -> code-sync-202412, origin/code-sync-202412) r12f 250610:2314 - Merge remote-tracking branch 'base/202411' into code-sync-202412
|\
| * 2ba104e (base/202411) xwjiang-ms 250610:1604 - [202411] Use ceos 4.32.5M as default ceos image version (sonic-net#18878)
| * 5fa5cda Longxiang Lyu 250610:0818 - [202411][dualtor-aa] Add `dualtor_aa` support to `test_nvgre_hash` (sonic-net#18883)
| * afecbbf zitingguo-ms 250609:1334 - [Cherry-pick][ACL] Collect all upstream ports and Include service port into upstream neighbors in ACL tests (sonic-net#18847)
| * 2e4247b pragnya-arista 250609:0632 - [202411][sonic-mgmt]Fix decap/test_subnet_decap.py::test_vlan_subnet_decap (sonic-net#18778)
| * 0bfc7a8 Longxiang Lyu 250606:0943 - [dualtor-io] Fix duplication merge condition (sonic-net#18828)
| * 52d3771 Zhaohui Sun 250605:2046 - Restore configuration after vxlan module (sonic-net#18714)
| * 3d0922f Yaqiang Zhu 250605:2259 - [202411][pktgen] Skip test_pktgen in m0/mx/m1 (sonic-net#18822)
| * 3de20a6 Zhaohui Sun 250516:1325 - Add secondary subnet config for t0 topologies (sonic-net#18399)
| * bb3e0f9 Zhaohui Sun 250605:1416 - Xfail test_dir_bcast.py due to known issue on Broadcom platform (sonic-net#18787)
| * 158c562 Justin Wong 250604:2058 - Add snmp lldp state check after config_reload (sonic-net#18805)
| * e39c891 eyakubch 250605:0415 - bug: added fast reboot into reboot_type check (sonic-net#18551)
| * 8c7dd3b Cong Hou 250604:1433 - Remove the skip/xfail for the dualtor_io link failure test (sonic-net#18712)
| * 5dbc53d mssonicbld 250604:0952 - [dualtor-io] fix dualtor sniffer start slow issue (sonic-net#18758) (sonic-net#18776)
| * 105cdf6 StormLiangMS 250603:0844 - [CRM AVAILABLE] To enhance the crm tests for TD3 and Cisco devices (sonic-net#18733)
| * 4251b38 andywongarista 250601:1828 - Add restore_image fixture to test_multi_hop_upgrade_path (sonic-net#18230) (sonic-net#18532)
| * 85a55d8 Longxiang Lyu 250528:2313 - [dualtor] Fix `test_orchagent_slb` (sonic-net#18666)
| * 95a8764 Vivek Verma 250227:0656 - Fix fixture invocation order in qos_sai_base.py to prevent teardown failure. (sonic-net#17180)
| * 9a72265 Justin Wong 250514:1844 - Add PTF parameter for ceos neighbor lacp multiplier (sonic-net#18215)
| * cd1375d Longxiang Lyu 250529:1029 - [dualtor-io] Validate and recover active-active setup (sonic-net#18675)
| * 763c1b3 Longxiang Lyu 250528:2314 - [dualtor] Fix loganalyzer not exist issue (sonic-net#18674)
```
@pragnya-arista
Copy link
Contributor Author

Raised 19061 for master, with request to backport to 202505

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants